[uim-commit] r457 - trunk/helper

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-01 01:25:37 -0800 (Tue, 01 Feb 2005)
New Revision: 457

Modified:
   trunk/helper/toolbar-common-gtk.c
Log:
* helper/toolbar-common-gtk.c:
 -(hbox_hierarchy_changed):Removed not used function.


Modified: trunk/helper/toolbar-common-gtk.c
===================================================================
--- trunk/helper/toolbar-common-gtk.c	2005-02-01 08:41:45 UTC (rev 456)
+++ trunk/helper/toolbar-common-gtk.c	2005-02-01 09:25:37 UTC (rev 457)
@@ -56,7 +56,6 @@
 
 static unsigned int read_tag;
 static int uim_fd;
-static GtkWidget *helper_parent_widget;
 
 static gboolean
 prop_button_pressed(GtkButton *prop_button, GdkEventButton *event, GtkMenuShell *prop_menu);
@@ -79,9 +78,6 @@
 static void
 prop_menu_activate(GtkMenu *menu_item, gpointer data);
 
-static void
-hbox_hierarchy_changed(GtkWidget *widget, GtkWidget *widget2, gpointer data);
-
 GtkWidget *
 uim_helper_toolbar_new(void);
 
@@ -423,8 +419,7 @@
   if(event->button == 3) {
     prop_right_button_pressed(prop_button, event, prop_menu);
   } else if(event->button == 2) {
-    if(helper_parent_widget)
-      gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
+    gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
   }
   return FALSE;
 }
@@ -464,8 +459,7 @@
   if (!event) {
     return FALSE;
   } else if (event->button == 2 || event->button == 3) {
-    if(helper_parent_widget)
-      gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
+    gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
     return FALSE;
   }
 
@@ -590,8 +584,7 @@
   if(event->button == 3) {
     prop_right_button_pressed(prop_button, event, prop_menu);
   } else if(event->button == 2) {
-    if (helper_parent_widget)
-      gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
+    gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
   } else {
     /* exec uim-im-switcher */
     system("uim-im-switcher &");
@@ -632,21 +625,13 @@
   if(event->button == 3) {
     prop_right_button_pressed(prop_button, event, prop_menu);
   } else if(event->button == 2) {
-    if (helper_parent_widget)
-      gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
+    gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
   } else {
     /* exec uim-pref */
     system("uim-pref-gtk &");
   }
 }
 
-static void
-hbox_hierarchy_changed(GtkWidget *widget, GtkWidget *widget2, gpointer data)
-{
-  helper_parent_widget =  gtk_widget_get_parent(widget);
-}
-
-
 GtkWidget *
 uim_helper_toolbar_new(void)
 {
@@ -655,9 +640,6 @@
   right_click_menu = right_click_menu_create();
   button_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
  
-  g_signal_connect(G_OBJECT(hbox), "hierarchy-changed",
-		   G_CALLBACK(hbox_hierarchy_changed), hbox);
-
   if(!menu_buttons){
     tmp_button = gtk_button_new_with_label("?");
     gtk_button_set_relief(GTK_BUTTON(tmp_button), GTK_RELIEF_NONE);