diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-17 16:02:10 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-17 16:02:10 -0600 |
| commit | 6e60a40ec583b507aef6254a744631f30f9e072d (patch) | |
| tree | b38ed22bfa7ca864def9532fa6d25e83384f4974 /debian/patches/gtk_box_api.patch | |
| parent | 9f5bd6e87a8c6ea411a2326e44814b686a501a55 (diff) | |
| parent | 4a2175798e434a4e33def2f30e15b49714eab33b (diff) | |
| download | ayatana-indicator-datetime-6e60a40ec583b507aef6254a744631f30f9e072d.tar.gz ayatana-indicator-datetime-6e60a40ec583b507aef6254a744631f30f9e072d.tar.bz2 ayatana-indicator-datetime-6e60a40ec583b507aef6254a744631f30f9e072d.zip | |
Merging in Ubuntu Desktop
Diffstat (limited to 'debian/patches/gtk_box_api.patch')
| -rw-r--r-- | debian/patches/gtk_box_api.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches/gtk_box_api.patch b/debian/patches/gtk_box_api.patch new file mode 100644 index 0000000..0dd28f0 --- /dev/null +++ b/debian/patches/gtk_box_api.patch @@ -0,0 +1,41 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> +Subject: Port to the new gtk_box_new() instead of gtk_hbox_new(). + +Index: indicator-datetime/src/indicator-datetime.c +=================================================================== +--- indicator-datetime.orig/src/indicator-datetime.c 2012-01-12 23:59:50.815675283 +0100 ++++ indicator-datetime/src/indicator-datetime.c 2012-01-13 00:02:24.083668449 +0100 +@@ -34,6 +34,7 @@ + #include <glib-object.h> + #include <glib/gi18n-lib.h> + #include <gio/gio.h> ++#include <gtk/gtk.h> + + /* Indicator Stuff */ + #include <libindicator/indicator.h> +@@ -1261,7 +1262,12 @@ + + mi_data->gmi = gtk_menu_item_new(); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Icon, probably someone's face or avatar on an IM */ + mi_data->icon = gtk_image_new(); +@@ -1472,7 +1478,12 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), + dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Label, probably a username, chat room or mailbox name */ + mi_data->label = gtk_label_new(""); |