Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed tray.c for newer versions of libnotify.

  • Loading branch information...
commit f611ff57594a60b5060180edd7e9973594cab3a3 1 parent c4b80d9
Mitchell Cooper authored
20  .gitignore
@@ -15,4 +15,24 @@ stamp-h1
15 15
 *.bak
16 16
 .#*
17 17
 *~
  18
+*.deps
  19
+*.mo
18 20
 a.out
  21
+conspire.pc
  22
+conspire
  23
+conspire-bot
  24
+gchat.pc
  25
+gchat
  26
+gchat-bot
  27
+gchat-text
  28
+xchat
  29
+xchat-text
  30
+tools/make-te
  31
+src/common/conspire-config.h.in
  32
+src/common/conspire-config.h
  33
+src/common/gchat-config.h.in
  34
+src/common/gchat-config.h
  35
+extra.mk
  36
+configure
  37
+buildsys.mk
  38
+aclocal.m4
37  src/fe-gtk/tray.c
@@ -134,8 +134,7 @@ fe_tray_set_balloon(const char *title, const char *text)
134 134
 		return;
135 135
 
136 136
 	stext = strip_color(text, -1, STRIP_ALL);
137  
-	n = notify_notification_new(title, stext, NULL, NULL);
138  
-	notify_notification_attach_to_status_icon(n, sticon);
  137
+	n = notify_notification_new(title, stext, sticon);
139 138
 	notify_notification_set_timeout(n, 20000);
140 139
 	notify_notification_show(n, NULL);
141 140
 
@@ -189,10 +188,10 @@ tray_stop_flash(void)
189 188
 		nets = tray_count_networks ();
190 189
 		chans = tray_count_channels ();
191 190
 		if (nets)
192  
-			tray_set_tipf(_("conspire: Connected to %u networks and %u channels"),
  191
+			tray_set_tipf(_("GChat: Connected to %u networks and %u channels"),
193 192
 								nets, chans);
194 193
 		else
195  
-			tray_set_tipf("conspire: %s", _("Not connected."));
  194
+			tray_set_tipf("GChat: %s", _("Not connected."));
196 195
 	}
197 196
 
198 197
 	if (custom_icon1)
@@ -491,15 +490,15 @@ process_message_highlight(gpointer *params)
491 490
 		/* FIXME: hides any previous private messages */
492 491
 		tray_hilight_count++;
493 492
 		if (tray_hilight_count == 1)
494  
-			tray_set_tipf(_("conspire: Highlighted message from: %s (%s)"),
  493
+			tray_set_tipf(_("GChat: Highlighted message from: %s (%s)"),
495 494
 								from, sess->channel ? sess->channel : _("unknown channel"));
496 495
 		else
497  
-			tray_set_tipf(_("conspire: %u highlighted messages, latest from: %s (%s)"),
  496
+			tray_set_tipf(_("GChat: %u highlighted messages, latest from: %s (%s)"),
498 497
 								tray_hilight_count, from, sess->channel ? sess->channel : _("unknown channel"));
499 498
 	}
500 499
 
501 500
 	if (prefs.input_balloon_hilight)
502  
-		tray_set_balloonf(message, _("conspire: Highlighted message from: %s (%s)"),
  501
+		tray_set_balloonf(message, _("GChat: Highlighted message from: %s (%s)"),
503 502
 								 from, sess->channel ? sess->channel : _("unknown channel"));
504 503
 }
505 504
 
@@ -519,14 +518,14 @@ process_message(gpointer *params)
519 518
 
520 519
 		tray_pub_count++;
521 520
 		if (tray_pub_count == 1)
522  
-			tray_set_tipf(_("conspire: New public message from: %s (%s)"),
  521
+			tray_set_tipf(_("GChat: New public message from: %s (%s)"),
523 522
 								from, sess->channel ? sess->channel : _("unknown channel"));
524 523
 		else
525  
-			tray_set_tipf(_("conspire: %u new public messages."), tray_pub_count);
  524
+			tray_set_tipf(_("GChat: %u new public messages."), tray_pub_count);
526 525
 	}
527 526
 
528 527
 	if (prefs.input_balloon_chans)
529  
-		tray_set_balloonf(message, _("conspire: New public message from: %s (%s)"),
  528
+		tray_set_balloonf(message, _("GChat: New public message from: %s (%s)"),
530 529
 								 from, sess->channel ? sess->channel : _("unknown channel"));
531 530
 }
532 531
 
@@ -550,15 +549,15 @@ process_private(gpointer *params)
550 549
 
551 550
 		tray_priv_count++;
552 551
 		if (tray_priv_count == 1)
553  
-			tray_set_tipf(_("conspire: Private message from: %s (%s)"),
  552
+			tray_set_tipf(_("GChat: Private message from: %s (%s)"),
554 553
 								from, network);
555 554
 		else
556  
-			tray_set_tipf(_("conspire: %u private messages, latest from: %s (%s)"),
  555
+			tray_set_tipf(_("GChat: %u private messages, latest from: %s (%s)"),
557 556
 								tray_priv_count, from, network);
558 557
 	}
559 558
 
560 559
 	if (prefs.input_balloon_priv)
561  
-		tray_set_balloonf(message, _("conspire: Private message from: %s (%s)"),
  560
+		tray_set_balloonf(message, _("GChat: Private message from: %s (%s)"),
562 561
 								 from, network);
563 562
 }
564 563
 
@@ -584,15 +583,15 @@ process_invited(gpointer *params)
584 583
 
585 584
 		tray_invite_count++;
586 585
 		if (tray_invite_count == 1)
587  
-			tray_set_tipf(_("conspire: Invite from: %s (%s) to %s"),
  586
+			tray_set_tipf(_("GChat: Invite from: %s (%s) to %s"),
588 587
 								from, network, channel);
589 588
 		else
590  
-			tray_set_tipf(_("conspire: %u private messages, latest from: %s (%s) to %s"),
  589
+			tray_set_tipf(_("GChat: %u private messages, latest from: %s (%s) to %s"),
591 590
 								tray_priv_count, from, network, channel);
592 591
 	}
593 592
 
594 593
 	if (prefs.input_balloon_priv)
595  
-		tray_set_balloonf("", _("conspire: Invite from: %s (%s) to %s"),
  594
+		tray_set_balloonf("", _("GChat: Invite from: %s (%s) to %s"),
596 595
 								 from, network, channel);
597 596
 }
598 597
 
@@ -612,15 +611,15 @@ process_dcc(gpointer *params)
612 611
 
613 612
 		tray_dcc_count++;
614 613
 		if (tray_dcc_count == 1)
615  
-			tray_set_tipf(_("conspire: DCC offer from: %s (%s)"),
  614
+			tray_set_tipf(_("GChat: DCC offer from: %s (%s)"),
616 615
 								nick, network ? network : "unknown network");
617 616
 		else
618  
-			tray_set_tipf(_("conspire: %u DCC offers, latest from: %s (%s)"),
  617
+			tray_set_tipf(_("GChat: %u DCC offers, latest from: %s (%s)"),
619 618
 								tray_dcc_count, nick, network ? network : "unknown network");
620 619
 	}
621 620
 
622 621
 	if (prefs.input_balloon_priv)
623  
-		tray_set_balloonf("", _("conspire: DCC offer from: %s (%s)"),
  622
+		tray_set_balloonf("", _("GChat: DCC offer from: %s (%s)"),
624 623
 								nick, network ? network : "unknown network");
625 624
 }
626 625
 

0 notes on commit f611ff5

Please sign in to comment.
Something went wrong with that request. Please try again.