Mercurial > pidgin3 / changeset

--- a/pidgin/pidgindebug.c	Mon Jul 15 04:11:24 2019 -0400
+++ b/pidgin/pidgindebug.c	Mon Jul 15 16:48:29 2019 -0400
@@ -65,6 +65,8 @@
 	gboolean paused;
 
 	GtkWidget *popover;
+	GtkWidget *popover_invert;
+	GtkWidget *popover_highlight;
 	gboolean invert;
 	gboolean highlight;
 	GRegex *regex;
@@ -390,12 +392,17 @@
 }
 
 static void
-regex_menu_cb(GtkWidget *item, const gchar *pref) {
+regex_menu_cb(GtkWidget *item, PidginDebugWindow *win)
+{
 	gboolean active;
 
 	active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(item));
 
-	purple_prefs_set_bool(pref, active);
+	if (item == win->popover_highlight) {
+		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/highlight", active);
+	} else if (item == win->popover_invert) {
+		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/invert", active);
+	}
 }
 
 static void
@@ -403,6 +410,10 @@
 		PidginDebugWindow *win)
 {
 	GdkRectangle rect;
+	if (icon_pos != GTK_ENTRY_ICON_PRIMARY) {
+		return;
+	}
+
 	gtk_entry_get_icon_area(entry, icon_pos, &rect);
 	gtk_popover_set_pointing_to(GTK_POPOVER(win->popover), &rect);
 #if GTK_CHECK_VERSION(3,22,0)
@@ -546,6 +557,12 @@
 			widget_class, PidginDebugWindow, expression);
 	gtk_widget_class_bind_template_child(
 			widget_class, PidginDebugWindow, tags.match);
+	gtk_widget_class_bind_template_child(
+			widget_class, PidginDebugWindow, popover);
+	gtk_widget_class_bind_template_child(
+			widget_class, PidginDebugWindow, popover_invert);
+	gtk_widget_class_bind_template_child(
+			widget_class, PidginDebugWindow, popover_highlight);
 	gtk_widget_class_bind_template_callback(widget_class, toolbar_context);
 	gtk_widget_class_bind_template_callback(widget_class, save_cb);
 	gtk_widget_class_bind_template_callback(widget_class, clear_cb);
@@ -555,6 +572,7 @@
 	gtk_widget_class_bind_template_callback(widget_class,
 			regex_changed_cb);
 	gtk_widget_class_bind_template_callback(widget_class, regex_popup_cb);
+	gtk_widget_class_bind_template_callback(widget_class, regex_menu_cb);
 	gtk_widget_class_bind_template_callback(widget_class,
 			regex_key_release_cb);
 	gtk_widget_class_bind_template_callback(widget_class,
@@ -582,9 +600,6 @@
 			"background-image: none;"
 			"background-color: @success_color;"
 		"}";
-	GtkBuilder *builder;
-	GtkWidget *popover_invert;
-	GtkWidget *popover_highlight;
 
 	gtk_widget_init_template(GTK_WIDGET(win));
 
@@ -649,30 +664,10 @@
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filterlevel",
 						filter_level_pref_changed, win);
 
-		builder = gtk_builder_new_from_resource(
-				"/im/pidgin/Pidgin/Debug/filter-popover.ui");
-		win->popover = GTK_WIDGET(gtk_builder_get_object(builder,
-					"popover"));
-		gtk_popover_set_relative_to(GTK_POPOVER(win->popover),
-				win->expression);
-
-		popover_invert = GTK_WIDGET(gtk_builder_get_object(builder,
-					"popover.invert"));
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(popover_invert),
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->popover_invert),
 				win->invert);
-		g_signal_connect(G_OBJECT(popover_invert), "toggled",
-				G_CALLBACK(regex_menu_cb),
-				PIDGIN_PREFS_ROOT "/debug/invert");
-
-		popover_highlight = GTK_WIDGET(gtk_builder_get_object(builder,
-					"popover.highlight"));
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(popover_highlight),
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->popover_highlight),
 				win->highlight);
-		g_signal_connect(G_OBJECT(popover_highlight), "toggled",
-				G_CALLBACK(regex_menu_cb),
-				PIDGIN_PREFS_ROOT "/debug/highlight");
-
-		g_object_unref(builder);
 	}
 
 	/* The *start* and *end* marks bound the beginning and end of an

--- a/pidgin/resources/Debug/debug.ui	Mon Jul 15 04:11:24 2019 -0400
+++ b/pidgin/resources/Debug/debug.ui	Mon Jul 15 16:48:29 2019 -0400
@@ -276,4 +276,45 @@
       </object>
     </child>
   </template>
+  <object class="GtkPopover" id="popover">
+    <property name="can_focus">False</property>
+    <property name="relative_to">expression</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkCheckButton" id="popover_invert">
+            <property name="label" translatable="yes">Invert</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <signal name="toggled" handler="regex_menu_cb" object="PidginDebugWindow" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="popover_highlight">
+            <property name="label" translatable="yes">Highlight matches</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <signal name="toggled" handler="regex_menu_cb" object="PidginDebugWindow" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>

--- a/pidgin/resources/Debug/filter-popover.ui	Mon Jul 15 04:11:24 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.12"/>
-  <object class="GtkPopover" id="popover">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkCheckButton" id="popover.invert">
-            <property name="label" translatable="yes">Invert</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="popover.highlight">
-            <property name="label" translatable="yes">Highlight matches</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

--- a/pidgin/resources/pidgin.gresource.xml	Mon Jul 15 04:11:24 2019 -0400
+++ b/pidgin/resources/pidgin.gresource.xml	Mon Jul 15 16:48:29 2019 -0400
@@ -7,7 +7,6 @@
     <file compressed="true">About/credits.json</file>
     <file compressed="true">Conversations/invite_dialog.ui</file>
     <file compressed="true">Debug/debug.ui</file>
-    <file compressed="true">Debug/filter-popover.ui</file>
     <file compressed="true">Debug/plugininfo.ui</file>
     <file compressed="true">Log/log-viewer.ui</file>
     <file compressed="true">Prefs/prefs.ui</file>